(maint) Fix class relationships

Fixes the following manifest: Class[foo] -> Class[bar]

Would fail with undefined local variable or method `host_class'
exception.
Merge pull request #2438 from dalen/hostclasstypefix

(maint) Fix class relationships