Move more user customizations into defaults.