lotsa minor changes

[Fergus Henderson]

Hi,

I just committed a bunch of minor changes that have been sitting around
in my directory for a while. I didn't think needed reviewing.
The log messages, which are fairly detailed, should explain the changes.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.