I squashed the other commits, but I also ran Eclipse's clean up tool on
it, just for fun.