Cleaner handling of Keys