Given the changes that will be coming with the new roles/permissions model, I'm hesitant to refactor this at this time.  I'd prefer that we refactor it as we introduce the new model.