Changed check in the SmartUnpack method, reverted change in the DepAdd method.