Finalize 85333dfc88c: *use* the (...)-stripped variable name.
Pervent bin shift by one if underflows are included.