Fix the thermal diffusivity macro so it accepts composition data.