Also remove error messages that depended on ObjectKinds() - future changes will potentially remove this interface and the replacements here are equivalent.