Fixed a TODO in the option parsing

Use an object merge instead, which more clearly defines the default options.

(Improves absolutely nothing in functionality, but I saw your TODO and thought I'd just spend 5 min fixing it.)