remove unused variables, rename some variables, move and change

variable initializations, etc., prior to larger changes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709751 13f79535-47bb-0310-9956-ffa450edef68