Don't inject into beans by name.

It's better to just make the properties available as new beans.