So, since the chances of hitting upstream are small right now, my fork has just been pushed to extras-devel under the name `flopswap-marmistrz`.