fix: Add tail recursion where it's possible but missing (#51)

fix: Add tail recursion where it's possible but missing (#51) #120