Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision e84382bd450d0ddb9a03b545b1a3cce0f32ed4d7)
+++ doc/papers/general/Paper.tex	(revision 860f19f8e4e35fd97620e0da5e6c37a54a001484)
@@ -2637,5 +2637,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		& 125		& 293			\\
+source code size (lines)			& 196		& 186		& 125		& 290			\\
 redundant type annotations (lines)	& 27		& 0			& 2			& 16			\\
 binary size (KB)					& 14		& 257		& 14		& 37			\\
@@ -2843,7 +2843,7 @@
 }
 _Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
-void push_stack( struct stack * s, void * value ) {
+void push_stack( struct stack * s, void * v ) {
 	struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-	*n = (struct stack_node){ value, s->head }; /***/
+	*n = (struct stack_node){ v, s->head }; /***/
 	s->head = n;
 }
@@ -2968,6 +2968,5 @@
 	node * head;
 	stack() : head( nullptr ) {}
-	stack( const stack<T> & o) { copy( o ); }
-	stack( stack<T> && o ) : head( o.head ) { o.head = nullptr; }
+	stack( const stack<T> & o ) { copy( o ); }
 	void clear() {
 		for ( node * next = head; next; ) {
Index: doc/papers/general/evaluation/c-stack.c
===================================================================
--- doc/papers/general/evaluation/c-stack.c	(revision e84382bd450d0ddb9a03b545b1a3cce0f32ed4d7)
+++ doc/papers/general/evaluation/c-stack.c	(revision 860f19f8e4e35fd97620e0da5e6c37a54a001484)
@@ -38,7 +38,7 @@
 _Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
 
-void push_stack( struct stack * s, void * value ) {
+void push_stack( struct stack * s, void * v ) {
 	struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-	*n = (struct stack_node){ value, s->head }; /***/
+	*n = (struct stack_node){ v, s->head }; /***/
 	s->head = n;
 }
Index: doc/papers/general/evaluation/cpp-stack.hpp
===================================================================
--- doc/papers/general/evaluation/cpp-stack.hpp	(revision e84382bd450d0ddb9a03b545b1a3cce0f32ed4d7)
+++ doc/papers/general/evaluation/cpp-stack.hpp	(revision 860f19f8e4e35fd97620e0da5e6c37a54a001484)
@@ -12,5 +12,4 @@
 	stack() : head( nullptr ) {}
 	stack( const stack<T> & o ) { copy( o ); }
-	stack( stack<T> && o ) : head( o.head ) { o.head = nullptr; }
 
 	void clear() {
Index: doc/papers/general/evaluation/cpp-vstack.cpp
===================================================================
--- doc/papers/general/evaluation/cpp-vstack.cpp	(revision e84382bd450d0ddb9a03b545b1a3cce0f32ed4d7)
+++ doc/papers/general/evaluation/cpp-vstack.cpp	(revision 860f19f8e4e35fd97620e0da5e6c37a54a001484)
@@ -24,5 +24,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(); }
 
@@ -31,11 +30,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 e84382bd450d0ddb9a03b545b1a3cce0f32ed4d7)
+++ doc/papers/general/evaluation/cpp-vstack.hpp	(revision 860f19f8e4e35fd97620e0da5e6c37a54a001484)
@@ -15,8 +15,6 @@
 	stack();
 	stack( const stack & o );
-	stack( stack && o );
 	~stack();
 	stack & operator=( const stack& o );
-	stack & operator=( stack && o );
 	bool empty() const;
 	void push( const object & value );