Refactored parsing to use operands.