Updates to weak callable mechanism, and rewriting callbacks.