Do some further tweaking to improve matching by storing string size. While here, add the necessary .WAIT to allow parallel builds.
4900ea76d8