Resolves spacing in macros and updates uncrustify