Index: tools/cfa.nanorc
===================================================================
--- tools/cfa.nanorc	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
+++ tools/cfa.nanorc	(revision 67fa9f99aebe68e73094bddc3ebf1c0d1c2d7844)
@@ -18,8 +18,8 @@
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
-color brightyellow "\<(try|catch|catchResume|finally)\>"
+color brightyellow "\<(try|catch(Resume)?|finally)\>"
 
 # Control Flow Statements
-color magenta "\<(return|break|continue|fallthru|throw|throwResume)\>"
+color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
 
 # Operator Names