Preserve the order of slurpy kwargs.  Fix a heisentest.