Options/rbac minor code cleanup.