Working out the interplay within Map variations.

I think this is something I can live with.