I've been accumulating drive-by cleanups and other small supporting
changes during my sub-CAs work. To improve the signal-noise ratio
and reduce the burden of reviewing the feature, I'm going to submit
some of these cleanups separately for review/merge beforehand.
Here's the first few.