Ignore built-in and command-line-specified macros.
Remove accidentially slipped in debug statement.
Improve consistency.
Let clang-format-3.4 format the source code.