forgiving about inconsistencies in the source pmap. Also, remove a new- line character terminating a nearby panic string.