Excellent!

Actually, Hijack currently has an even more conservative fix than the one I sent in, but I cannot prove the other parts are necessary (I don't think they are).

Perhaps I'll nuke the extras from Hijack just to verify that they are having no effect.