minor cleanup on matched_pair
fixes #15