ENG-7050: Use enumset without the spec changes.

I can move this to AuthSystem I guess.