Fix two more template constraints.