More work on new annotations. In the middle of comment in RnSource.