Also agree with a TODO and a follow-up. Another idea to weigh is to replace the GAUGE macro with a ARITHMETIC_GAUGE and SYMBOLIC_GAUGE. Similarly replace Scope::gauge() with Scope::arithmeticGauge(), and Scope::symbolicGauge(), and likewise for gaugeFromStatName etc.  