Improved code reduction refactorings.

Change-Id: I2bee9e578810dd9ee1b23341a29713fc594d81f4
3 files changed