Finished replacing color comparisons with the new assertColorMatch.
Lots of simplification and cleanup on color objects.