Missed some minor semantic changes in the merge fixes.