Reworking writers and factories and such