Refactor: python: Use substitution strings in more places.

There's a couple places where it's still awkward to use substitution
strings - mainly, in patterns which themselves hold substitution
characters and get handled later.