One more cleanup of last changes to ChromaKey