As mentioned above, it would be simpler to remove the old refund mechanism and STORAGE_CLEAR_REFUND and switch to internal refund accounting mechanisms. The refund counter is almost meaningless when transaction costs are nearly zero after the upgrade.