Rework keylist_update() to fix both a buffer-size limitation and a