Tidy up the role resolver