Fix reader macros to actually be macros