CIF checks: reduce casting
Follow-up to this:
!1612 (comment 8626724)