Further changes to the parser engine.