chg: use charSetN in some cases
fix: bug in subst
chg: use only modCharSet instead of charSetViaModCharSet in factorization