Hacks for Simon's non-spec parsing proposal.