I've pushed this upstream already, since Fedora Rawhide doesn't work without this patch. I'm posting here for the benefit of other distros that might hit this problem. Rich.