Better argument parsing.
Remove this.