Refactoring to AddOperationExplicitizer - trying to get rid of the entire class