More Hunspell-related changes

Change-Id: Iadf8141c6375871c9900d6d019a1461afd6e013e