Improve argparsing.