Some nonessential code cleanup.