[cleanup] Some more boolifying