Handle transaction conversion directly instead of via a new var