[WIP][3.9] Remove some circular references