Fix whitespace in macros

Use spaces for indentation also within macros.