Add extra conditions for map quantification

[morganthomas]

Resolved by changing the Map semantics so that this change is no longer needed.