Fixed argument handling in optional match