o Code simplification and refactoring: - Previously we used two temporary files when writing descriptors to disk; now we only use one. Implements ticket 1376.
