3 files changed, 13 insertions, 15 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2834709..47cd77f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,8 +182,7 @@ initialize_environment(void)
 		name[0] = '$';
 		g_strlcpy(name + 1, *p, sizeof(name) - 1);
 
-		reg = new QRegister(name);
-		QRegisters::globals.insert(reg);
+		reg = QRegisters::globals.insert(name);
 		reg->set_string(value);
 	}
 
@@ -213,9 +212,9 @@ main(int argc, char **argv)
 	interface.ssm(SCI_STYLECLEARALL);
 
 	/* search string and status register */
-	QRegisters::globals.initialize("_");
+	QRegisters::globals.insert("_");
 	/* replacement string register */
-	QRegisters::globals.initialize("-");
+	QRegisters::globals.insert("-");
 	/* current buffer name and number ("*") */
 	QRegisters::globals.insert(new QRegisterBufferInfo());
 	/* environment registers */
@@ -259,7 +258,7 @@ main(int argc, char **argv)
 	 * If munged file didn't quit, switch into interactive mode
 	 */
 	/* commandline replacement string register */
-	QRegisters::globals.initialize("\x1B");
+	QRegisters::globals.insert("\x1B");
 
 	Goto::table = &cmdline_goto_table;
 	interface.ssm(SCI_EMPTYUNDOBUFFER);
diff --git a/src/qregisters.cpp b/src/qregisters.cpp
index df75679..41e1a16 100644
--- a/src/qregisters.cpp
+++ b/src/qregisters.cpp
@@ -260,9 +260,9 @@ QRegisterTable::QRegisterTable(bool _undo) : RBTree(), must_undo(_undo)
 {
 	/* general purpose registers */
 	for (gchar q = 'A'; q <= 'Z'; q++)
-		initialize(q);
+		insert(q);
 	for (gchar q = '0'; q <= '9'; q++)
-		initialize(q);
+		insert(q);
 }
 
 void
@@ -418,7 +418,7 @@ done:
 	if (!reg) {
 		if (!initialize)
 			throw State::InvalidQRegError(name, is_local);
-		reg = table.insert(new QRegister(name));
+		reg = table.insert(name);
 		table.undo_remove(reg);
 	}
 
diff --git a/src/qregisters.h b/src/qregisters.h
index 7e126fd..05a56ae 100644
--- a/src/qregisters.h
+++ b/src/qregisters.h
@@ -177,16 +177,15 @@ public:
 		RBTree::insert(reg);
 		return reg;
 	}
-
-	inline void
-	initialize(const gchar *name)
+	inline QRegister *
+	insert(const gchar *name)
 	{
-		insert(new QRegister(name));
+		return insert(new QRegister(name));
 	}
-	inline void
-	initialize(gchar name)
+	inline QRegister *
+	insert(gchar name)
 	{
-		initialize(CHR2STR(name));
+		return insert(CHR2STR(name));
 	}
 
 	inline QRegister *