The Haskell code generator now builds. Minor renaming in type and interpreter sources.