Cleans up some of the fallout from PR kern/57711 fixes. Could do a little more to nix PAX_SEGVGUARD conditionals but maybe not worth it.