by being sneaky, there are now no leading newlines. layouts which previous included the setup file, now declare dosetup="yes" in their include template_include file=foo line.