Part of our "all parsers need unit tests" effort, given the multiple recent CVEs that have come out of parser bugs.

It would also be good to keep the implementations of these two functions closer together, as the latter depends on the details of the former to be correct. With the current layout, it would be easy to modify one and not the other.