cleanup and style fixes after cwrc-writer merge.