Fixed up whitespace.  No code changes.
Minor renaming of macros.