Overhaul of key management (again).