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