Fix subtle bug around initialize options.

If options were passed in, it would clear out _all_ default values, not
just those overwritten. Subtle, and wouldn't be an issue if we used
keyword parameters. Oh well.