Certainly within the program of action on small arms and light weapons in particular there is attention to the issue of stockpiling and the need to ensure that stockpiles are well regulated and controlled and do not leak into the illicit side of the arms trade. What I don't think has been tackled and needs to be tackled, as you pointed out, is the situation of surplus weapons, which, again, particularly after the end of the Cold War, tended to be passed on. Not enough attention was given to actually destroying surplus weapons, which I think we need to see more of.
There has been a historical tradition of transferring on old systems when new ones are purchased. I think we need to break that cycle at some point so that it's understood, by states in particular, that as part of the process of getting rid of weapons that are problematic, they need to destroy them when they've stopped using them and not pass them on to others.