Use new closure generation code in vectorisation