Finish converting definitions of PN expressions to PNCollection objects