RFC: cmp and ops reform