Changes to remove sonatype property deref issues needed some polishing.