Arg, having trouble getting the diffs right.