Change to atDefaults method in Expression.java