Cleanup fallout from previous merge.