Better collapse of colourways