Further changes to data_settings handling.