Fixing a lot of generation. Coq now accepts the file.

TODO: Still need to simplify list generation to use the short [] syntax.