Reindent de-macrofied code.

This commit only affects whitespace; `git diff -w` for it is empty.

Author: nnethercote