Tweaks after Nathan's code review.