Improve callback facility.