Make more use of defaults