Simplify the logic here while we're at it.



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