Expand abbreviations on semicolon per #731