* use_class_as_object removed, link_class added where required.