begin switching parameter order to parsers: first tokens, then user state; fix unit tests to match