Fixed exporting things users oughtn't to be providing their own instances for.