[WIP] Solve cyclic references

Eg. here is a very recent complaint about flooding the log: https://secure.helpscout.net/conversation/56936009/50/