Some cosmetic changes, too.

darcs-hash:20051103131824-65a35-efda579b3cf02af36a31015c4d7984070ffca359.gz