Re-doing our default value stuffz.

Fixes #11. Fixes #6.