Add comparator support to the GasTank

Implements comparator support for the GasTank, as suggested in #1829.