Group the key table list generation fields. (dm)
Use forKeyNameEntries() in more places. (dm)