Preparatory changes to support parametric types