I've been swamped and finally getting back to this. I'll update the subject line as suggested.

As far as unrelated cosmetic changes, I can just drop them from this. I don't like having a separate commit just for some cosmetic changes such as spacing.

-Mark