one thing is: intrinsics and singletons are ...gone in the branch. so maybe just a replacement of that logic?