diff --git a/guile/features.awk b/guile/features.awk
index 977503a7..476a887c 100644
--- a/guile/features.awk
+++ b/guile/features.awk
@@ -32,7 +32,7 @@ function output(line) {
 		list = params[param];
 		type = params[param];
 		sub(/\(.*/, "", type);
-		sub(/^\w+\(/, "", list); sub(/\)$/, "", list);
+		sub(/^.*\(/, "", list); sub(/\)$/, "", list);
 
 		string = string" (\""type"\"";
 
diff --git a/lib/lib.awk b/lib/lib.awk
index bb375f78..c41b00ac 100644
--- a/lib/lib.awk
+++ b/lib/lib.awk
@@ -80,7 +80,7 @@ function output(line) {
       list = params[param];
       type = params[param];
       sub(/\(.*/, "", type);
-      sub(/^\w+\(/, "", list); sub(/\)$/, "", list);
+      sub(/^.*\(/, "", list); sub(/\)$/, "", list);
       count = split (list, fields, /,/);
       for (field = 1; field <= count; field++) {
 	if (param_decl == "")