Alter grammar to deal with expressions and lists correctly
Skip mixin definitions during expansion and output
Fix a few errors during tests - deal with builtins, and comments in the mix.