Bring in line with the latest rustc
Mostly revamp the command mapper