diff.c: shuffling code around