Undo workaround for satisfying role requirements with multis
   Deal with some resulting flattening issues.  Probably overkilled there.
Avoid automatic punning when role is last item in compilation unit