Touched up Harpoon code to be safer.