Code

combine-diff.c: type sanity.