Yet more fiddling.