Fixes for Darwin.

Includes mechanism to cherry-pick existing commits.
Cleanup.

Removing code that's no longer needed.