Corrected some instance domains.
Rounded out the supported-classes detection.