More complete solution to multiple callback problem.

Refs 9d6f6ef89c75384ffda5aa086a70af25484661fb.