Next patch in the series, for review.