Refactored parsing engine.