small clean-ups; replaced dependency on Carbon.framework with CoreFoundation