Follow changes in comparison primops (see #6135)