Move 'words' from shortcuts to translations.
Check for shortcuts *before* comparisons.
*Many* more tests.
Fixes thanks to the tests.