Update/simplify permission checks.

Change-Id: I02c8e967f44057359f3221027820920a11e98f73