diff --git a/src/frontends/xforms/forms/fdfixh.sed b/src/frontends/xforms/forms/fdfixh.sed
index 62c5e2969a..e6c6f23fa8 100644
--- a/src/frontends/xforms/forms/fdfixh.sed
+++ b/src/frontends/xforms/forms/fdfixh.sed
@@ -69,8 +69,7 @@ s/extern \(.*\) create_form_form_\(.*\)[(]void[)]/\1 build_\2(void *)/
 
 # All other lines are deleted:
 /^typedef struct/d
-/^	FL_FORM/d
-/[vcl]data/d
+/^	/{; /FL_OBJECT/!d; }
 
 
 # For all lines starting with FL_OBJECT...
@@ -86,7 +85,7 @@ H; d
 
 # The struct is ended by "} FD_xxx;", so now's the time to paste back the
 # contents of the hold space.
-/} FD_/{
+/^} FD_.*;/{
 
 # 1. Rewrite "} FD_xxx;" as   "\nstruct FD_xxx : public FD_base {".
 s/} \(.*\);/\
diff --git a/src/frontends/xforms/forms_gettext.h b/src/frontends/xforms/forms_gettext.h
index 6f1f9870bf..449ba1b4c5 100644
--- a/src/frontends/xforms/forms_gettext.h
+++ b/src/frontends/xforms/forms_gettext.h
@@ -19,7 +19,7 @@
 /// Extract shortcut from "<ident>|<shortcut>" string
 char const * scex(char const *);
 
-/// Extract ident from "<ident>|<shortcut>" string
+/// Extract identifier from "<ident>|<shortcut>" string
 char const * idex(char const *);
 
 #endif // FORMS_GETTEXT_H