Some minor parser changes.
Generators added.