Hand build tail recursion to avoid stack overflow

This pair of recursive functions was always supposed to take advantage
of tail recursion. In debug builds we're seeing some instances of stack
overflow however (especially with TensorFlow). Manually apply the tail
recursion optimization to eliminate this.