Put some final touches on argument handling.