Simplify some Map and Set signatures.
Merge pull request #139 from Drup/map_sig

Simplify some Map and Set signatures.