A few code location cleanups.

Change-Id: I24b00cc007da74d665bce1fd784f022661355682