Responding to further reviews, simplifying parsers.