Upgrade to new analysis-core.