That same comment also applies to any `Class* variable`. There are a number of these below that also need to be fixed