Tidy up again and crank options default export.