Minor updates in parser.
Updated common data structures.
Improved const-correctness.