Expansions to VCD parsing code.