Reduced script transport
Further script transport cleanup, close gh-1123.