Yeah, debugging/stab in the dark territory - i thought maybe the error I pasted in IRC was maybe originating here, but this change had no effect. Did not plan on trying to ship this :)