Added resolve_strategy stage for simplify.
Added resolve_strategy stage for simplify_insert.
Made simplify variant-aware
Fixed how resolve_strategy::simplify_insert is called from the public functions
Merge branch 'feature/variants' into develop