[DF-4476] More clear code after macOS fixes