Merge: nitunit: use annotations