core: Import 'vi' from official.
core: Update 'vi'.
core: Import 'which' from official.
core: Update 'which'.