Bug 1044742 - Fix review comments on rev 9f9b3c194a76 - r=bz