Use logbitp in a couple of places.