CloudWatch Templating Variable "All Value" Remove Dimension

I have a dashboard using CloudWatch as the backing data store. I have a variable, let’s call it $country that I use to filter the country dimension on my metric.

If I enable the Include All Option for the variable with the blank/auto default the value is too long. If I change the all option to use the * value I get back a TS[] which can break metric math (and run into problems with high cardinality dimensions).

Is there a way to configure the query editor so that if the $country variable is set to the All Option then the country dimension is removed from the query entirely?