Cleaned up some formatting in the POM.
Fixed up a couple of other this-is-really-just-a-parent-POM issues I'd missed.