Tweaks based on feedback from @ibbs.