Use a for loop to set the defaults for __call__ params

Instead of setting the default kwargs based on a repeated
setdefault() call, just use a for loop to set the defaults.

Change-Id: I5c7fd22856912545bf5f95fd07568375dbecbe5b
Merge "Use a for loop to set the defaults for __call__ params"