Use less static imports and raw OperationStepHandler to try to make lightning stop giving compile errors on master-ignore