BUG-509: break up SchemaAwareApplyOperation