Refactor.

Avoid an unnecessary intermediate call to setProperty: with a nil argument when
handling circular dependencies.