Cleans up my improvements to Josh's preferences.