Reorganization to clarify dependencies

Would it be helpful to document what this comment does, or do we expect people to RTFM ?
Both would be defendable.