Add creation of immediate type after substituting