Use on_supported_os everywhere
46c40319775e2293a9e92556fe68755fa348f92d removed these helpers but was merged too soon.