core: use if* in a couple places.