Removed intermediate "_arg" structures from grammar.

This dramatically reduces the number of dead-end parsings using the new
bottom-up approach (reduces time spent parsing and solving from ~70s to
~5s)