Refactored parsing.