Some further simplifications to DrawColourPattern