Minor cleanup.
Minor cleanup of matcher.