Permit macros to return constants
Forgot boolean constants..
style fixes