Refactoring VCD, to remove some testing infrastructure.