CRM-12053 fix remaining static operators