Don't javaaddpath gratuitously

javaaddpath has the side effect of clearing global variables.  Shouldn't
need to do it over and over.
Merge branch 'simplify'