CodeReview feedback, and some tests.