Some small code cleanup.