Improvements to context writer.