Merge cfish into bf and cleanup.