Clean up some pundit code

You were almost entirely there! There was just a little clean up with the policy scope and how we were using it.