Slightly clean up handling of prerequisites to prepare for eventual grouped prerequisites.
Adding source display for database.

* Needs page numbers also listed.