Add a couple more custom caps that we can check.

This should really simplify how other places check for whether the
current user can do things.

Not all of these capabilities are used yet.  But they will be soon.
Apply some of the new caps from the previous commit

This is a tidier way of handling the edge cases.