Get rid of some trivial warnings; unused variables, ambiguous if-else,
[mmh] / DATE
1 1 Jul 2003