bug 925970

* A follow up round of changes per visual reviewers' request.

r=peterla