Some tidy up to the Lazybones templates.