Move more tool switches into the mapping tables

--HG--
extra : rebase_source : 7b6a76f243eb20c9a405285f02fdffff945fecac