More cleanup after review.