Refactor injection styles some more.

See f66a6ca5cee48d6f28e979c0bdc4882dc3f41f87 if you want to review what changed in this file. Looks good to me :+1: