Tweaks for oracle.
Revert to PickleType.
Merge branch 'trevorskaggs/oracle-tweaks'