simplifies stuff somewhat for the main code and remains the same
tricky business for -spersistent.



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