Hygiene: Kill ifEquals helper, use ifCond instead

Switch to more generic helper.

Change-Id: Ie7fb6620b6008d8c4d5f3184daeac80ec73e220f
Merge "Hygiene: Kill ifEquals helper, use ifCond instead"