Cleanups from review.