Keep role definitions from punning in sink context at compunit end.
Remove ancient roll-your-own .base(16)