Fix up Map definition

There's no need to define the key type as &'static str when &'a str will
do and be more flexible