Also check for imported data types and class names
Minimal stylistic change
hsimport 0.2.6.2