Improve handling of native type ids; use non-native type ids as fallback