Refactor importance sampling callbacks