RLO after data update

Almost all of this turned out to be unnecessary, there are very few
conflicts between the RLO modules.