Bug 840780 (follow-up): fix nits. r=me