More work on settings handling.