Standardize `DEFAULT_CONFIG` handling

This pulls `DEFAULT_CONFIG` handling changes off the end of #795.
This PR is based on my recent #920, so merge that one first.  After
this lands, I'll rebase the remainder of #795.