Nicer command line argument matching