Minor writer class changes.