[fold] Solution to non-unity-build issues.