RFC: Add singleton map

Needs a small test, and maybe a discussion.