renumber vars a bit
renumber vars a bit

hughperkins/coriander,hughperkins/coriander,hughperkins/cuda-on-cl,hughperkins/cuda-on-cl,hughperkins/coriander,hughperkins/cuda-on-cl,hughperkins/coriander,hughperkins/cuda-on-cl