contrib: migrate nitunits to annotations