Tidy up and use more sane defaults.