Reduced dependence on core.Color (towards full removal)