Move update_keys to keydb rather than merge.