Fixes angular macros for order of operations