Unbotch my refactoring of || and && handling in VCL expressions.
Unbotch my refactoring of || and && handling in VCL expressions.

Fixes: #2729

gquintard/Varnish-Cache,gquintard/Varnish-Cache,gquintard/Varnish-Cache,gquintard/Varnish-Cache