Converted all devarianted_xxx classes to the new resolve_variant approach.