more precise resolution:=optional directives

and avoiding split-packages on javassist