moving changes from java_rewriting_engine4 branch

Are the changes in this file necessary any more? I think I changed the sorts on all of these productions.