Minor tweaks as prelude to squashing multiple commits.