Bug 994841 - Remove address parameter from constructor; nit fixes, r=gaye