Bugfixes in the strip_abbrev code