Add (and use) generic reference counter, to improve signal:noise ratio