I recently added a TODO to PickPackageLine.cc, marking a piece of code which seems a little suspect to me. I did try to follow up on my suspicion, but got lost in the dependency processing code. I'll have another go at it later, but I'd appreciate any input from others. Max.