Add pop() and swap() to the Map trait#6236