Fix bootstrap handling of CLT and MacVim