Eliminate some trivial diffs in read.c