Rework of before/after render/transaction callbacks