A small clean up of previous patch suggested by Marco

No functional change