Phase 2 of parse engine rewrite: 19 tests fail