make-key-string improvements