Some minor nitpicking and some slightly ugly stuff. It currently fails a
regression test (v00017.vtc). I'm on it.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5063 d4fa192b-c00b-0410-8231-f00ffab90ce4