Fix up dynamic loading; we export a structure of functions now from