Add better comparator support for all tank TE's.