Update to latest comp type defs from main nml2 repo