Updating examples & comp type defns to latest from main NML2 repo