Remove extra null key check
Rename parameter name
Define internal attribute in case we missed the global initialization.
Populate more win32 version info values. Fixes #8578