Fix reader macros to actually be macros
Merge branch 'master' into pr/443
Light copy-editing