cleanups: Remove unused vars from combine-diff.c