Minor cleanup of TSMessage
Propagate TSMessage's API change