Converted r->first_component_of and r->second_component of to Set.