Merge "Silence unused-but-set-variable warnings." into main