Fix issue with cyclic requires.