From Cristina: handle templated types.