Further work on bringing the parser inline with the spec