Fix some more global parameter resets after test fiddling.