Clean up supertx functions

Avoid comparing values from different enums.

Change-Id: I405f87942a64e86bda899b84a142c4d64414dd81
3 files changed