Move more stuff into sane defaults.