Minor changes to default ACL code
fix for "Too many branches" in _verify_acls