more simplifications/cleanups to httpd patch