More refactoring for data representations of operations.