Raise ParserError for internal problems. Improve coverage. Cleanup.