Made a mess of things, but fixed it.