Change depth expansion from recursive to deferred-chain