Add indentation fix for a bunch of macros