Cleanup from isuftin's code review.