Updated grammar to be closer to properly recursive
The Qf grammar is a mess at the moment... but it passes most of the tests