Key counting fixes, add missing key names
Fix golf with recent Kakoune changes