Tidyup shufflevector calls - don't repeat inputs if you can avoid it.