Oops. Somehow my eyes skipped that part when I read @monarchdodra's comment. Sorry about that!

I still disagree with this choice, but I'm not going to hold back the PR because of it. After all, it fixes the problem in question here, and it does so without introducing a module-level named struct.