When substituting in an identifier, also substitute in type.
Improve value slice generation.