diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h
index fe30a1c769..23ab01b2b2 100644
--- a/src/frontends/LyXKeySym.h
+++ b/src/frontends/LyXKeySym.h
@@ -57,7 +57,7 @@ public:
 	 * Return the value of the keysym into the UCS-4 encoding.
 	 * This converts the LyXKeySym to a 32-bit encoded character.
 	 */
-	virtual size_t getUCSEncoded() const = 0;
+	virtual char_type getUCSEncoded() const = 0;
 
 	/**
 	 * Return a string describing the KeySym with modifier mod.
diff --git a/src/frontends/qt4/QLyXKeySym.C b/src/frontends/qt4/QLyXKeySym.C
index 665be121b0..4f8627947f 100644
--- a/src/frontends/qt4/QLyXKeySym.C
+++ b/src/frontends/qt4/QLyXKeySym.C
@@ -201,7 +201,7 @@ string QLyXKeySym::getSymbolName() const
 }
 
 
-size_t QLyXKeySym::getUCSEncoded() const
+char_type QLyXKeySym::getUCSEncoded() const
 {
 	if (text_.isEmpty())
 		return 0;
diff --git a/src/frontends/qt4/QLyXKeySym.h b/src/frontends/qt4/QLyXKeySym.h
index 45a607fc8e..69d6001fe0 100644
--- a/src/frontends/qt4/QLyXKeySym.h
+++ b/src/frontends/qt4/QLyXKeySym.h
@@ -61,7 +61,7 @@ public:
 	 * Return the value of the keysym into the UCS-4 encoding.
 	 * This converts the LyXKeySym to a 32-bit encoded character.
 	 */
-	virtual size_t getUCSEncoded() const;
+	virtual char_type getUCSEncoded() const;
 
 	/**
 	 * Return a human-readable version of a key+modifier pair.
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 012ea03fe3..1e10da58a2 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -296,7 +296,9 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
 
 	//Encoding const * encoding = view()->cursor().getEncoding();
 	//encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
-	size_t encoded_last_key = keysym->getUCSEncoded();
+	// FIXME: encoded_last_key shadows the member variable of the same
+	// name. Is that intended?
+	char_type encoded_last_key = keysym->getUCSEncoded();
 
 	// Do a one-deep top-level lookup for
 	// cancel and meta-fake keys. RVDK_PATCH_5
diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index d819fe27f5..4fce15e678 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -88,7 +88,7 @@ private:
 	///
 	LyXView * lyx_view_;
 
-	/// the last character added to the key sequence, in ISO encoded form
+	/// the last character added to the key sequence, in UCS4 encoded form
 	char_type encoded_last_key;
 
 	///