shall we take the opportunity to get rid of these defines here?  IIRC they're used only for JACTIVE_HAT_UP et. al.