Improvements to Expression.java