Issue #170: Converting more variables to settings and config.