Phase 2 of parse engine rewrite: 27 tests fail