Colouriser cleanups.