Post-merge fixup.