dozens of incorrect definitions in bundled types file