Option for Price Calculator to apply to variant surcharges

It would be great to have the option for Price Calculators to apply to the variant surcharges. Currently, a Price Calculator can be used to make changes to a base price, but it has no effect on variant pricing. It'd be useful to be able set all base pricing and variant pricing to MSRP and apply rules with a Price Calculator.

Variants can be set with discount rules, but these products show at MSRP in the cart with the discounts applied below the subtotal. This can be confusing for customers who expect to see the price they're paying in the cart.