Reduce difference to trunk.
Cleanup.