Tidy up some bits. We can now at least list all the keys.