Egrammar fix

Whitespace fixes and a move of primary expression so it isn't under function calls.