Reformuling enable_ifs in a more cosmetic way