Miscellaneous changes

A few cleanups plus a backport that addresses a CVE.

The pipeline's piupart job failed with errors from APT that I cannot reproduce locally. We can try kicking it off again in a day or two.

I'd like to upload 7.10.0-2 once this is merged.