This self-described "nasty hack" didn't seem, at first glance, to be such a nasty thing to fix.
Attention @thuffman, @duperrin