Clean up macro expansion

Macros can only be expanded recursively, so the log macros needed to be
brought back. Also some unnecessary parenthesis, curly braces and unused
arguments/code removed.

Author: joostjager