moving changes from java_rewriting_engine4 branch

I made NothingExpression no longer a function so this shouldn't be needed either.