* Minor template improvements by Alessandro.