Ensure mapping is one time, rather than assuming idempotency, refs #40