Catching up to the new argument parser.