Style nit: we omit the braces for single line statements (this applies to a few more places in this pr too).