Operator parsing overhaul complete