Don't import unsafe into file namespace.
Added wrappers for 6.1.5 API additions.