Major cleanup and expansion of the NVIDIA id section.