Some changes in advance of implementing a topology move that includes
the upper probabilities.