Vsdx: More cleanup.