Fix typos introduced in merge.