I've attached a new version of the patch here, in case anyone has any
further comments.  Otherwise, I intend to commit this in a couple of
days.

Best regards,
Stefan Kangas