Bug 1063468 - Remove more unnecessary use of address() r=sfink