Removing an unnecessary macro.
Whitespace changes.