slightly more granular unsafe
upstream rust changes