Phase 2 of parse engine rewrite: t+