Fixed up remaining damage caused by bad merge.