New thermodynamic models and revised calibrations for the Ti-in-zircon and Zr-in-rutile thermometers