Fix bug inadvertently introduced in #484: mapc2p should always return a tuple
Merge pull request #494 from ketch/default_map_return_tuple

Fix bug inadvertently introduced in #484: mapc2p should always return a tuple