Tweak whyrun support