Merge "Don't overly call transport.transportDirName()"