Tail recursion optimization
Fix build with tip
Tail recursion optimization
Fix diagnostics tests after renames