There is one remaining nit: the docstring of provided-mode-derived-p was updated by that earlier commit to say "MODES or their aliases"; presumably a similar change should be made to the docstring of derived-mode-p?