Simplify initial parse tree for parameters
Refactor two broken parser tests to expect the correct thing
Mark broken tests as such