Improve type extraction from hole-str