Code cleanup. Not every color has to be a ColorWithAlternatives any longer now that we have the isSameColor() function.