Have callback recognize any callable

Previously, callback had to be a function.  This misses a lot of things,
notably instance methods.  Change to recognize any callable.

Change-Id: I9d2a00fe53f7e8039f0badeb4af0fdd3c6339b89