This revision includes some minor cleanups of the code base, primarily
in code sections connected with indenting.
This revision changes the depends list for the "build" target in
build.xml to include "clean".