Switching over to using PNCollections for all PN expressions