Bug 673569 - Address review feedback (r=Waldo)