Fix an old, long-standing typo!
Be a bit more consistent about when we try to inject the framework.