Slightly improve transaction handling when interacting with the NBI.