Updated for new TCHARM activate/deactivate routines.