Make using role short name for introspection work.

This is decidedly a hack for now; further refactors to parametrics
will take the opportunity to clean this up.