Include helpers and remove whyrun_supported