Deal with circularity more radically.
Merge branch 'master' of https://github.com/haxetink/tink_core
Minor.