Tidier key handling.