Improve PreviousBuildDirError workaround (now more reliable & simpler)