I think I'd still rather keep the parameters consistent, even if it's only temporary. @nedbat, thoughts on the matter?