Fix address-related tracing prepopulators #3988