Bug 826291 - Part 3: Address more nits and comments. Fix a bug in the l10n argument matching.