Fixed usages of isSame to areSame.
TypeId's are now obtained via functions, not macro.