Various changes to colour conversion specification to use chromaticities.