A little cleanup in the 5.0 branch.