Cleaned up superuser-requirement checks