Minor cleanup as I slowly move through this code
[gonvert] / support /
2009-10-29 Ed PageRe-arranging things