Clean up after dirty role names.