Refactor operations so that operators are not split across modules.