More sensible config handling.