Issue #170: Converting remaining general variables to config, state, or settings.