Unify maven goal options some more