WYCS: resolved bug with the way Equations and Equals states are substituted.  #231