Stop using specific implementation of ParameterizedType