Slightly clean up the template markup.