tiny bits of refactoring; though not sure it's an improvement
Merge branch 'synonyms'