Bug 2126: Fixed bugs in MatchConvertorImpl.OfMatchToSALMatchConvertor().