Simplify code, also required since M3.0 throws java.lang.NoSuchMethodError: org.codehaus.plexus.PlexusContainer.hasComponent(Ljava/lang/String;Ljava/lang/String;)Z