Various manual fixes
Various manual fixes

Ignore-this: 732e60e74cc7ea4cf78b024181cfe83a

Thanks to Xavier Lagorce for the tips.

darcs-hash:20100314210407-c41ad-da8da6570935e7042345d4375654559a853bd10c.gz

avsm/lwt-OLD,avsm/lwt-OLD