Fix up post-merge.