Add keyof and valof. Correct keys' and vals' use of nl.