Better argument parsing.