Fix a compilation error introduced in a merge.