Remove most dependences on Colour.