Handle review comments


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/auto-version-2915@37077 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Cleanups


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/auto-version-2915@37078 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb