Move a few lines and duplicate comments to make diffs line up a little more closely