I've made a clean new branch 'dynamic-modules-clean-1' on top of a recent master which you should be able to rebase easily.