Added proper handling of EventSkipping to MatchToGen