Just some cleanups around policy checks that came up during review. The code is still not productive.