Work correctly even with no options.

The way we handle the defaults has been updated to be cleaner,
this is related to #27.