A few cleanups & simplifications, specifically to `update_privileges`, `grant` and `revoke`.