Cleaning/bug fix for Expression.java