Rollup merge of #144877 - Zalathar:coverage-various, r=lcnr

coverage: Various small cleanups

This PR is a collection of small coverage-related changes that I accumulated while working towards other coverage improvements.

Each change should hopefully be fairly straightforward.

Author: samueltardieu