cpp: Improve langtypes
cpp: More type fixes