Clean up more rec functions.