Fix small nits introduced by the merge.