Some additional code cleanup.