Updated to reflect recent changes in Varnish master.