Latest comp type defns from main nml2 repo