Expanded abbreviations. Should have caught all the ones in dictstems. Fixes #4