More map es6 stuff

why? Because I want a future where we can upgrade to es6 maps, and drop our maps...
I'm open to alternatives here.