Refactor injection styles some more.

I have not, I'll remove the first and rebase.