Code cleanup: avoid "ring.ring" constructs