I also think this change should go in. I never understood what those two parameters were for anyway. Some further tweaks appear to be needed, though; please see the attached patch.