Bug 1081375: Remove write-only datastructures. r=rnewman