Minor code movement.