Fix enumerations so they still work for things which are't Num
Add some jail to Gen_regexps
Add gen_regexps to the working list