Move default variables into defaults.