Some minor improvements to pnmapToMany