Yet more minor cleanup