Resurrect raceIndex, use it to augment unamb