Cleaning up preferences-related code.
3 files changed