Misc (backward compatible) changes to make srcs acceptable to a Haskell 98 compiler.
Bulk of final changes for 2.01
Initial revision
