Update to latest comptype defns from main nml2 repo