Continuing work on correctly implementing settings API.