Fix non-interpolated subst terms