Clearer comments & code for fix #17

This addresses Seba's comments.
Simplify calling of pmap-boilerplate and pmap-core

The other changes to pmap-core have made this simplification possible.