Add builtin var->var mapping to vectorisation