Tweak per feedback.

I'll squash the commits once everything is good.