Policy changes to be more accurate

I accidentally based this on your first-run branch. The extraneous commits should disappear once that gets merged to master.