Refactored parsers.