[MacInterop] code cleanup