Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/Paper.tex	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -2627,5 +2627,5 @@
 									& \CT{C}	& \CT{\CFA}	& \CT{\CC}	& \CT{\CCV}		\\ \hline
 maximum memory usage (MB)			& 10,001	& 2,502		& 2,503		& 11,253		\\
-source code size (lines)			& 197		& 186		& 133		& 303			\\
+source code size (lines)			& 197		& 186		& 125		& 293			\\
 redundant type annotations (lines)	& 27		& 0			& 2			& 16			\\
 binary size (KB)					& 14		& 257		& 14		& 37			\\
@@ -2925,5 +2925,4 @@
 	stack() : head( nullptr) {}
 	stack( const stack<T> & o ) { copy( o ); }
-	stack( stack<T> && o ) : head( o.head) { o.head = nullptr; }
 	~stack() { clear(); }
 	stack & operator= ( const stack<T> & o) {
@@ -2931,10 +2930,4 @@
 		clear();
 		copy( o );
-		return *this;
-	}
-	stack & operator= ( stack<T> && o ) {
-		if ( this == &o ) return *this;
-		head = o.head;
-		o.head = nullptr;
 		return *this;
 	}
@@ -2979,16 +2972,9 @@
 	stack() : head( nullptr ) {}
 	stack( const stack & o ) { copy( o ); }
-	stack( stack && o ) : head( o.head ) { o.head = nullptr; }
-	~stack() { clear(); }
+		~stack() { clear(); }
 	stack & operator= ( const stack & o ) {
 		if ( this == &o ) return *this;
 		clear();
 		copy( o );
-		return *this;
-	}
-	stack & operator= ( stack && o ) {
-		if ( this == &o ) return *this;
-		head = o.head;
-		o.head = nullptr;
 		return *this;
 	}
Index: doc/papers/general/evaluation/cpp-stack.hpp
===================================================================
--- doc/papers/general/evaluation/cpp-stack.hpp	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/evaluation/cpp-stack.hpp	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -31,5 +31,4 @@
 	stack() : head(nullptr) {}
 	stack(const stack<T>& o) { copy(o); }
-	stack(stack<T>&& o) : head(o.head) { o.head = nullptr; }
 	~stack() { clear(); }
 
@@ -38,11 +37,4 @@
 		clear();
 		copy(o);
-		return *this;
-	}
-
-	stack& operator= (stack<T>&& o) {
-		if ( this == &o ) return *this;
-		head = o.head;
-		o.head = nullptr;
 		return *this;
 	}
Index: doc/papers/general/evaluation/cpp-vstack.cpp
===================================================================
--- doc/papers/general/evaluation/cpp-vstack.cpp	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/evaluation/cpp-vstack.cpp	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -15,5 +15,4 @@
 stack::stack() : head(nullptr) {}
 stack::stack(const stack& o) { copy(o); }
-stack::stack(stack&& o) : head(o.head) { o.head = nullptr; }
 stack::~stack() { clear(); }
 
@@ -22,11 +21,4 @@
 	clear();
 	copy(o);
-	return *this;
-}
-
-stack& stack::operator= (stack&& o) {
-	if ( this == &o ) return *this;
-	head = o.head;
-	o.head = nullptr;
 	return *this;
 }
Index: doc/papers/general/evaluation/cpp-vstack.hpp
===================================================================
--- doc/papers/general/evaluation/cpp-vstack.hpp	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/evaluation/cpp-vstack.hpp	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -15,8 +15,6 @@
 	stack();
 	stack(const stack& o);
-	stack(stack&& o);
 	~stack();
 	stack& operator= (const stack& o);
-	stack& operator= (stack&& o);
 
 	void clear();
Index: doc/papers/general/evaluation/timing.dat
===================================================================
--- doc/papers/general/evaluation/timing.dat	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/evaluation/timing.dat	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -1,9 +1,9 @@
 "400 million repetitions"	"C"	"\\CFA{}"	"\\CC{}"	"\\CC{obj}"
-"push\nint"	3002	2459	1520	3305
-"copy\nint"	2985	2057	1521	3152
-"clear\nint"	1374	827	718	1469
-"pop\nint"	1416	1221	717	5467
-"push\npair"	4214	2752	946	6826
-"copy\npair"	6127	2105	993	7330
-"clear\npair"	2881	885	711	3564
-"pop\npair"	3046	5434	783	26538
+"push\nint"	3002	2459	1542	3269
+"copy\nint"	2985	2057	1539	3083
+"clear\nint"	1374	827	756	1469
+"pop\nint"	1416	1221	760	5098
+"push\npair"	4214	2752	950	6873
+"copy\npair"	6127	2105	987	7293
+"clear\npair"	2881	885	751	3460
+"pop\npair"	3046	5434	822	24962
Index: doc/papers/general/evaluation/timing.gp
===================================================================
--- doc/papers/general/evaluation/timing.gp	(revision 12bbb36784f1304c65a7cfb4f7601b385d038338)
+++ doc/papers/general/evaluation/timing.gp	(revision f86c8e5ecaac53c31e0a371cf9d091a3f8148761)
@@ -24,5 +24,5 @@
 set yrange [0:10]
 
-set label "26.5" at 7.125,10.5
+set label "25.0" at 7.125,10.5
 
 # set datafile separator ","