diff --git a/src/mathed/MathMacroTable.C b/src/mathed/MathMacroTable.C
index d7e2c0aa17..88e794d1d2 100644
--- a/src/mathed/MathMacroTable.C
+++ b/src/mathed/MathMacroTable.C
@@ -78,14 +78,6 @@ MacroTable & MacroTable::globalMacros()
 }
 
 
-// The local table.
-//MacroTable & MacroTable::localMacros()
-//{
-//	static MacroTable theLocalMacros;
-//	return theLocalMacros;
-//}
-
-
 bool MacroTable::has(docstring const & name) const
 {
 	return find(name) != end();
@@ -102,14 +94,14 @@ MacroData const & MacroTable::get(docstring const & name) const
 
 void MacroTable::insert(docstring const & name, MacroData const & data)
 {
-	//lyxerr << "MacroTable::insert: " << name << endl;
+	//lyxerr << "MacroTable::insert: " << to_utf8(name) << endl;
 	operator[](name) = data;
 }
 
 
 void MacroTable::insert(docstring const & def)
 {
-	//lyxerr << "MacroTable::insert, def: " << def << endl;
+	//lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
 	std::istringstream is(to_utf8(def));
 	MathMacroTemplate mac(is);
 	insert(mac.name(), mac.asMacroData());
diff --git a/src/mathed/MathMacroTemplate.C b/src/mathed/MathMacroTemplate.C
index d07ae26f76..a260d193f9 100644
--- a/src/mathed/MathMacroTemplate.C
+++ b/src/mathed/MathMacroTemplate.C
@@ -80,7 +80,7 @@ auto_ptr<InsetBase> MathMacroTemplate::doClone() const
 
 void MathMacroTemplate::edit(LCursor & cur, bool)
 {
-	lyxerr << "MathMacroTemplate: edit left/right" << endl;
+	//lyxerr << "MathMacroTemplate: edit left/right" << endl;
 	cur.push(*this);
 }
 
diff --git a/src/mathed/MathParser.C b/src/mathed/MathParser.C
index a43a8dba27..eda20fefff 100644
--- a/src/mathed/MathParser.C
+++ b/src/mathed/MathParser.C
@@ -325,7 +325,7 @@ private:
 	///
 	void tokenize(docstring const & s);
 	///
-	void skipSpaceTokens(istream & is, char c);
+	void skipSpaceTokens(idocstream & is, char_type c);
 	///
 	void push_back(Token const & t);
 	///
@@ -451,7 +451,7 @@ docstring Parser::getArg(char_type left, char_type right)
 }
 
 
-void Parser::skipSpaceTokens(istream & is, char c)
+void Parser::skipSpaceTokens(idocstream & is, char_type c)
 {
 	// skip trailing spaces
 	while (catcode(c) == catSpace || catcode(c) == catNewline)
@@ -466,7 +466,7 @@ void Parser::tokenize(istream & is)
 {
 	// eat everything up to the next \end_inset or end of stream
 	// and store it in s for further tokenization
-	docstring s;
+	std::string s;
 	char c;
 	while (is.get(c)) {
 		s += c;
@@ -480,15 +480,15 @@ void Parser::tokenize(istream & is)
 		is.unget();
 
 	// tokenize buffer
-	tokenize(s);
+	tokenize(from_utf8(s));
 }
 
 
 void Parser::tokenize(docstring const & buffer)
 {
-	istringstream is(to_utf8(buffer), ios::in | ios::binary);
+	idocstringstream is(buffer, ios::in | ios::binary);
 
-	char c;
+	char_type c;
 	while (is.get(c)) {
 		//lyxerr << "reading c: " << c << endl;