Clean up unneeded code

`pcv?` is already defined from the Roles list. Also, validate inclusion
in the Roles list directly, in case we change it in the future.