Minor corrections to previous merge.