Tidy up new role detection logic