overhaul transport-record handling