gustafn
committed
on 17 Feb 19
simplify and fix subst operation