Refactor replacement suggestions to handle insertion / removal