Remove even more of recursion-related code.