Fix formatting for statements and comments.
Fix formatting for macro statements.

Macro statement's body is not aligned properly.