the above is duplication for the `make_module_extra_extensions` function, which is still there, and still being used?

did you mean to kick out `make_module_extra_extensions` and replace it by the above?

I agree this approach is better, but you should complete the task. ;-)