REV: Improved readability in parsing.