Remove unused/mutable default args

Having mutable default args is a bad idea
(http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments).

Change-Id: I4a51c1aea04a1d2fd1e03e72a0594d2ee80eb921
Merge "Remove unused/mutable default args"