Mavenified, assorted cleanup.