Since those role specifiers are checked in the grammar, there's no need
for the old checks to remain in place after 31eae602.  Remove them.

Backpatch to 9.5.

Noted and patch by Jeevan Chalke