Latest comptype defns and examples from main nml2 repo