Move params/defaults to params, to get rid of params/defaults