Commit af2bc9120e94344005060d0067d9a7725e22ef1b

henry 2001-09-16T21:31:38

Minor tidy ups