[PATCH 1/4] tools: Use with_resolver_flags instead of mutation