moving changes from java_rewriting_engine4 branch

I don't think this is necessary anymore either.