Improved macro-expression syntax, general clean up started