Remove conditional assignments to formerly optional arguments.