minor cleanup on matched_pair