make __make_callbacks smaller