Cleaned up MatchToGen a bit and added HelperMatchToGen