Merge "Dx: use context out/err everywhere."