[CanaryLayout]

Mostly to pretty it back up into the original shape (so it matches what was already in git)

[pasc1878]

Take one hit on format - your change is also only a format change.