Final avatar_kind insanity fix.