Removed else clause in handling of SUB_EVENTS. According to Tom it served no purpose.