Fix more merge artifacts.