Make broader use of alternative tool selection