Remove the need to use pmr2.rdf

- Try to limit the dependencies on the legacy (possibly bloated) module
  that had a somewhat different focus.
Cleaned up a label.