diff --git a/po/de.gmo b/po/de.gmo
index 7e3719b83b..b8d78227c1 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/ia.gmo b/po/ia.gmo
index 80eb568c04..eddcba4b7b 100644
Binary files a/po/ia.gmo and b/po/ia.gmo differ
diff --git a/po/sk.gmo b/po/sk.gmo
index 65335df4f6..bdda0b7417 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 148677b5fb..9a662a893b 100644
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -95,24 +95,11 @@ static GuiFontInfo * fontinfo_[NUM_FAMILIES][NUM_SERIES][NUM_SHAPE][NUM_SIZE];
 // if not cached, create it.
 GuiFontInfo & fontinfo(FontInfo const & f)
 {
-    bool const fontIsRealized =
-            (f.family() < NUM_FAMILIES) &&
-            (f.series() < NUM_SERIES) &&
-            (f.realShape() < NUM_SHAPE) &&
-            (f.size() < NUM_SIZE);
-    if (!fontIsRealized) {
-        // We can reset the font to something sensible in release mode.
-        LATTEST(false);
-        LYXERR0("Unrealized font!");
-        // We could be fancier here, if we wanted, and just fix things where
-        // there is a problem. But it doesn't seem worth it, since we should
-        // not be here in the first place.
-        GuiFontInfo * & fi =
-            fontinfo_[sane_font.family()][sane_font.series()][sane_font.realShape()][sane_font.size()];
-        if (!fi)
-            fi = new GuiFontInfo(f);
-        return *fi;
-    }
+	// LASSERT: Is there anything we might do here besides crash?
+	LBUFERR(f.family() < NUM_FAMILIES);
+	LBUFERR(f.series() < NUM_SERIES);
+	LBUFERR(f.realShape() < NUM_SHAPE);
+	LBUFERR(f.size() < NUM_SIZE);
 	// fi is a reference to the pointer type (GuiFontInfo *) in the
 	// fontinfo_ table.
 	GuiFontInfo * & fi =
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 13d17bb10f..da807d201a 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -104,11 +104,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 			name_ = convert<string>(ours);
 		}
 	}
-
-    // FIXME It does not look to me as if this needs to be redone
-    // over and over again. All the arguments are coming from the
-    // layout. If that changes....
-    Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
+	Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
 	if (lait != args.end()) {
 		docstring label = translateIfPossible((*lait).second.labelstring);
 		docstring striplabel;