Reduce some more require cycles.

[jainkuniya]

No description provided.

[borisyankov]

Are these all reported as require cycles though? We don't need to go further than what is actually given as a warning.
Run the app and look at the console log. After we merged the previous PR there were just 3 outstanding require cycles that were in our code, and they seemed a little tricky (not much, just not straightforward)