Sure, I'll come back to this when #583 has been resolved, adding just the necessary callbacks in that case.