Fix default parameter.

Default parameters are evaulated on initial loading. This isn't alwasy
appropriate.

Change-Id: Ie85d62fdfd97245982bf730eb71342c13a979235