Generalize the modification check for no move

review2001002
Missing test on address before using it

issue3531
review2021002