Misc style changes in support of #161

These should not change anything functionally.
Fixes #279, letting l10n_client work again