Update to match new systeminfo functions.