Make code samples in LAYOUT.md consistent with proposed template sample changes.