Fixing another cycle and a few violations for toString() methods.