Is "top-level" in the comments still accurate? Or are things more general now ("static")?