Clean up a little more from our permissions reworking.