Clean up the way prefs work a little.