Moving default definitions around