I had to fix this in the course of deploying Hippotat; my fixes are in
https://git.distorted.org.uk/~mdw/userv-utils/
in the branch
mdw/fixes 395a5bb98cfc2cb709586ac062cf353514daf280
I don't believe there's anything controversial here (except possibly for
my slightly snarky commit messages).
-- [mdw]