I made the judgment call that, since my punq fork is purely for my own stuff currently, I'm removing the functionality I don't use. This got rid of some of the weird hacky stuff I put in, but it didn't change much. The existing code just seems a lot leaner than the stuff I added, I guess.
Anyway, making another judgment call: I've been spinning my wheels on this a bit, so next week, I'm going to find something else to work on for a bit.
I don't know what, and I'm feeling a little under the weather right now, so I'm not going to try too hard.