Make defaults overridable. Minor cleanup.