Re-arrange some of our defaults.