Refs #7422. A marginally hackish (but effective?) way to avoid having to...

... unwrap None vars as args/kwags. This fixes an incorrect assumption that to have kwargs, one would first need to provide kwargs.