tweak per ongoing #260 code review.