Minor code cleanup for a new semester.