Further reorg. of the VGA code.