(Minor) code cleanup.