Adjust rules for the new primops