Index: src/Tuples/TupleAssignment.cc
===================================================================
--- src/Tuples/TupleAssignment.cc	(revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9)
+++ src/Tuples/TupleAssignment.cc	(revision 8d182b1ed853a31c8c46021c2f2a6be9c45ea31d)
@@ -65,9 +65,9 @@
 
 	/// Dispatcher for tuple (multiple and mass) assignment operations
-	class TupleAssignSpotter_new final {
+	class TupleAssignSpotter final {
 		/// Actually finds tuple assignment operations, by subclass
 		struct Matcher {
 			ResolvExpr::CandidateList lhs, rhs;
-			TupleAssignSpotter_new & spotter;
+			TupleAssignSpotter & spotter;
 			CodeLocation location;
 			ResolvExpr::Cost baseCost;
@@ -84,5 +84,5 @@
 
 			Matcher(
-				TupleAssignSpotter_new & s, const CodeLocation & loc,
+				TupleAssignSpotter & s, const CodeLocation & loc,
 				const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
 			: lhs( l ), rhs( r ), spotter( s ), location( loc ),
@@ -161,5 +161,5 @@
 		struct MassAssignMatcher final : public Matcher {
 			MassAssignMatcher(
-				TupleAssignSpotter_new & s, const CodeLocation & loc,
+				TupleAssignSpotter & s, const CodeLocation & loc,
 				const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
 			: Matcher( s, loc, l, r ) {}
@@ -191,5 +191,5 @@
 		struct MultipleAssignMatcher final : public Matcher {
 			MultipleAssignMatcher(
-				TupleAssignSpotter_new & s, const CodeLocation & loc,
+				TupleAssignSpotter & s, const CodeLocation & loc,
 				const ResolvExpr::CandidateList & l, const ResolvExpr::CandidateList & r )
 			: Matcher( s, loc, l, r ) {}
@@ -240,5 +240,5 @@
 
 	public:
-		TupleAssignSpotter_new( ResolvExpr::CandidateFinder & f )
+		TupleAssignSpotter( ResolvExpr::CandidateFinder & f )
 		: crntFinder( f ), fname(), matcher() {}
 
@@ -377,5 +377,5 @@
 	std::vector< ResolvExpr::CandidateFinder > & args
 ) {
-	TupleAssignSpotter_new spotter{ finder };
+	TupleAssignSpotter spotter{ finder };
 	spotter.spot( assign, args );
 }