Handle review comments on the proper branch


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


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