Smarter handling of MATCHCHAR