#69: Slight template changes.