Merge speed-up branch.