Clean-up on abbreviations.