Fix embedded parameterized types