Back to Statement Matching