Tweaked previous merge.