+ KeyValuePair as Functor and Apply.

Also some small improvements in the existing Map instances.