I have never consulted Calvin's writings, and what I have been told about them, I do not believe. Scripture proves scripture and should be our only source in gleaning the truth of Chris's doctrine. however, I do consult Greek concordances.
Thayer's concordance says the "world" in John 1:29, 3:16, 3:17, 6:33, 12:47, 1 cor 4:9, and 2 Cor 5:19, mean = any aggregate or general collections of particulas of any sort (used of believers only).