Parser:  Misc. fixes.