Simplify handling of variables during vectorisation