slightly improving option handling for tuple matcher