Don't be so patchlevel dependent