Adding constructor term
Renaming some AST elements
Using ids instead of symbols in primitives (again)
Merge branch 'feature-cons'
Sorting members in grammar