Clean up after refactoring.

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1508467 13f79535-47bb-0310-9956-ffa450edef68