A round of code cleanup.