Merge "Associate TCconstants with the TCM instead of TCImpl"