A little more code cleanup.