Tweaked after code review.