I spaced out doing other stuff today, so when I wanted to work on punq, I decided to just make the changes I had in mind and see what happened.
It's sadly not quite as simple as I thought I was making it. I took some time to make everything pass, but it's very much an "at what cost?" kind of deal.
It's super late, so I don't want to elaborate right now.