Convert stopgap, fix some bugs.
All grammars now go through proxy_actions.