That would mean merging resolve_variant and resolve_strategy, no ?