Reminder: rebase on the preload-refactor changes and bump ion-defs to

include it, otherwise these changes won't work