Writer cleanup and delegator refactor.