More cleanup in torrent source code.