Minor refactorings.

Change-Id: Ia0218bf86d142be80dd12d04de97da5d19293815
2 files changed