Fix stupid bug in map providers/builders

Map builders cannot be singletons :/

That was a very dumb mistake, really.