Remove outdated notations `pr1` and `pr2`

Replace them with `.1` and `.2`.

This is on top of #206, for ease of merging, and should not be merged until #206 is.  The actual content of this pull request is a single commit, the last one on the stack.