It's somewhat clearer what we're substituting into a format string if we name the variables inline, similarly to template files. In some places we format a mixture of template and other variables. Leave those unchanged for now.