integration: removing in-tree build dependencies and complexity.