eliminate some uses of passing addresses