Continued code cleanup.