Diminish subword-mode as well

This refactors the loading of diminish to make it more robust.