Move cf-key-functions.[ch] back to cf-key