Restored conditional libdispatch compile.
Merge python fixes