Minor changes recommended by Dolph.

Change-Id: I76fcbdc3e7a188619db5951e6e8beae19fb897df