Added code (from Stephen) to remove trailing chars on abbreviations.