Improved InstantiationStrategy (now also ties to find super types)