Assorted cleanups to macro implementations and project structure

can we quote that as well?