more fix to completion/abbrev expansion