Cleaning up template oddity