Revise SOURCE/BUILD_TREE propagation