Refactor OCI8 stuff a bit.