Improve callback management when diving.