Hmm, nahh - I don't want that can of worms opened up at the risk of not getting this fix in. If you have time and want to try as a separate PR off of this (or once this merges), that sounds like a good thing. 