g: small cleanup of mover.c