Small tidy up in move_to_san

No functional change.
Merge remote-tracking branch 'upstream/master'