Converted CVoid and CNull to match changes in CH build 2678