Small change to parsing compound equations

I'm still not sure if they work properly. Next step is to try and implement
empty categories and get some optional parentheses going.
Updated test grammar, resolved ambiguities