Clean up an unnecessary recursion.
More cleanup.