Mostly cosmetic changes to WhyIBL