Improvements from people in #twisted (teratorn,rwall).  Thanks!