Simplify some Map and Set signatures.

Come across those while reading the sources, it's (imho) quite more readable like that.