A couple more cleanups
Some bits I stumbled upon by chance, and adopting backtick/template strings where possible (without tripping over xgettext).
Some bits I stumbled upon by chance, and adopting backtick/template strings where possible (without tripping over xgettext).