Fixing two bugs.

Fixing the bug which sometimes deleted the callback function before it was called.  Fixing the bug which sometimes gave identical names to different callback functions.