Neaten out the colour handling.