Second pass at parameterized types.