Remove non-context-free constraints to simplify top levels