It's worth checking this branch in the unit tests by saving the wrong DistDeviate (purportedly from some earlier call) in the config structure and make sure that it correctly rebuilds the correct thing here.