Correctly import nested non-generic types inside generic containers used within same generic container. Fixes #13549