merge-recursive: Consolidate process_entry() and process_df_entry()