opam switch: Remove some dead code, and fix fallback when switch install fails