keylist.c tidyups/fixes.