*_avatar_type should have been updated with the migration and then this comparison with the constant is obsolete.