Avoid generation of unused replaceFrom* variables

Change-Id: I2a65485b8dcaa7b6ed4a049f97d460878b8bb17d