Extended Matcher and tests plus small SourceString edits