Start migrating to CoreFoundation.
More re-factoring to CF.