Continued refactor to cleanup MarkupParser