Fix other accidental changes made during merge.