This should make the code easier to read and stop us from being inconsistent.
Signed-off-by: Asad Sajjad Ahmed <asadsa@varnish-software.com>