Simplify and make it easier to extend bundle templates.