Automated Eclipse Clean-Up.

This was run with some fairly extreme settings to try to tidy up
formatting, and do things like make local variables "final" etc.