Getting rid of superfluous def.
Cleaned up recur case.
Many cleanups/simplifications of problem 84.