WYCS: bug fix for Expr.substitution().  Hopefully no more!