I reviewed the branch on GitLab.  Lots of nits, but also some doubts
about the design.  Not sure whether to give this ticket to Ondřej or
Stephen; since Ondřej was the one who gave it to me, I am passing it
back to him.