Make vectorisation part of the optimiser pipeline