Some cleanup for the transport factory stuff.