TSAGE: R2R - Get rid of some magic values related to eventType
TSAGE: BF - Fix erroneous check of eventType