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