Made default options more simple.

Gyah.  Meant to do it here.