Fix issue highlighted by m2e plugin, which prevented clean import into Eclipse. Also assorted whitespace changes.