Throttle prefs save with timeout and minor tidy.