Refactoring towards extensible operator set.