Improve coverage on parser.
Improve coverage of parser even more.