Assorted cleanups to macro implementations and project structure

can we quote this whole thing?