Get rid of the RaFT/Shepgestaler distinction.