Renamed the raw types to put hte _ at teh end, like literals
Renamed the treemap type to dictionary.
Changed the syntax of sequence expressions
Fixed issues with macros