Yet more writer cleanups