Nicer argument handling