Minor change trying to get subword-mode to stick for *all modes