Incorporate code review comments.

Callbacks are done safely now, outside of loops that access "this".