Get rid of keys magic; make the keys very explicit