Yet more tinkering.