Speed up writer. Merging pull request from thecontrarycat.