Constrain plane clearance from annular ring in Altium

I need to constrain a plane from shorting to the annular rings of a number of vias.

The dialog found at Rules and Constraints -> Design Rules -> Plane -> Power Plane Clearance allows me to enforce a clearance from a via, but that clearance appears to be reckoned from the hole diameter and not from the diameter of the annular ring.

The following two screen shots show the effect of an adjustment to the Clearance parameter from 10 to 6; when clearance is set to 10, the actual clearance to the annular ring is only 5 mils:

But when clearance is decreased to 1, the plane nearly shorts against the annular ring with only 1 mil of clearance:

If every via shared the same annular ring diameter of 10 mils, for example, it would be possible to generate a single rule to give the desired clearance by simply adding 10 mils to the desired clearance. However, some vias have larger hole diameters and annular rings; a rule that fit the smaller vias would short the plane against the larger vias, and a rule that fit the larger vias would leave larger clearances than desired around the small ones.

One way to accommodate varied via sizes would be to add all vias to a class based on their size, then add a compensated rule to target each class. However, I’d like to avoid manually tagging thousands of objects into classes, and this work seems superfluous since Altium already knows the size of each object.

Is there a more succinct way to specify a uniform plane clearance from the annular ring of every via?