Also do some further work in the back branches, where quite a bit wasn't
covered by Magnus' original back-patch.