Uniquify buffer names.
Fix dead keys.