final parser, still problems with incremental
Authored by: lomecb 2006-12-24
Parent: [r854]
Child: [r856]