Assorted cleanups to macro implementations and project structure

haha, that's my page of code right there!