Merge copy-editing from #28.