Please see the changes in https://salsa.debian.org/debian/genparse by Boyuan Yang and integrate yours there. I am then going to sponsor what comes out of that.